Merge "mw.Api: Deprecate mw.Api.errors, mw.Api.warnings"

diff --git a/includes/specials/SpecialEditWatchlist.php b/includes/specials/SpecialEditWatchlist.php
index 347f0c0..b447271 100644 (file)
--- a/includes/specials/SpecialEditWatchlist.php
+++ b/includes/specials/SpecialEditWatchlist.php
@@ -629,7 +629,7 @@ class SpecialEditWatchlist extends UnlistedSpecialPage {
                if ( $title->exists() ) {
                        $tools['history'] = $linkRenderer->makeKnownLink(
                                $title,
-                               $this->msg( 'history_short' )->text(),
+                               $this->msg( 'history_small' )->text(),
                                [],
                                [ 'action' => 'history' ]
                        );

diff --git a/languages/i18n/en.json b/languages/i18n/en.json
index a53b2cc..8bc8a36 100644 (file)
--- a/languages/i18n/en.json
+++ b/languages/i18n/en.json
@@ -173,6 +173,7 @@
        "searcharticle": "Go",
        "history": "Page history",
        "history_short": "History",
+       "history_small": "history",
        "updatedmarker": "updated since my last visit",
        "printableversion": "Printable version",
        "permalink": "Permanent link",

diff --git a/languages/i18n/qqq.json b/languages/i18n/qqq.json
index eee9b4e..3ce0e7b 100644 (file)
--- a/languages/i18n/qqq.json
+++ b/languages/i18n/qqq.json
@@ -358,6 +358,7 @@
        "searcharticle": "Button description in the search menu displayed on every page. The \"Search\" button is {{msg-mw|Searchbutton}}.\n{{Identical|Go}}",
        "history": "{{Identical|Page history}}",
        "history_short": "Text used on the history tab.\n\n{{Identical|History}}",
+       "history_small": "Uncapitalized version of {{msg-mw|History short}}.\n\n{{Identical|History}}",
        "updatedmarker": "Displayed in the page history (of a page you are [[Special:Watchlist|watching]]), when the page has been edited since the last time you visited it. This feature is used if [[mw:Manual:$wgShowUpdatedMarker|$wgShowUpdatedMarker]] is enabled.",
        "printableversion": "Display name for link in wiki menu that leads to a printable version of a content page. Example: see one but last menu item on [[Main Page]].\n\nSee also:\n* {{msg-mw|Printableversion}}\n* {{msg-mw|Accesskey-t-print}}\n* {{msg-mw|Tooltip-t-print}}\n{{Identical|Printable version}}",
        "permalink": "Display name for a permanent link to the current revision of a page. When the page is edited, permalink will still link to this revision. Example: Last menu link on [[{{MediaWiki:Mainpage}}]]\n\nSee also:\n* {{msg-mw|Permalink}}\n* {{msg-mw|Accesskey-t-permalink}}\n* {{msg-mw|Tooltip-t-permalink}}\n{{Identical|Permalink}}",

diff --git a/tests/phan/bin/phan b/tests/phan/bin/phan
index 61ad7da..ad06823 100755 (executable)
--- a/tests/phan/bin/phan
+++ b/tests/phan/bin/phan
@@ -7,6 +7,12 @@ if ! which realpath > /dev/null; then
        }
 fi
 
+if hash php7.0 2>/dev/null; then
+       export PHP="php7.0"
+else
+       export PHP="php"
+fi
+
 # Note that this isn't loaded in via composer because then composer can
 # only be run with php7.0
 if [ ! -f "$PHAN" ]; then
@@ -19,7 +25,7 @@ if [ ! -f "$PHAN" ]; then
                exit 1
        fi
 else
-       export PHAN="php7.0 $PHAN"
+       export PHAN="$PHP $PHAN"
 fi
 
 if [ -z "$MW_INSTALL_PATH" ]; then